<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
</head>
<body>
<<<<<<< HEAD
<h1>欢迎您来a给爷爪</h1>
=======
<h1>欢迎</h1>
>>>>>>> branch 'master' of https://gitee.com/caojiajun/Ymw.git
</body>
</html>